Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 15:03:25 +0000 (08:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 15:03:25 +0000 (08:03 -0700)
commitf5c541d7e20113434f011420e2175157ba9fdd52
tree6c9a883751736e742583e8221217e16c8b38d865
parent5e94390b55a0dcb5d05122e06179e48103b37ef4
parent38d19e4bf65d6255ab6379ec6be7af8e85a959d6
Merge from trunk.
src/xdisp.c